From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 12 Aug 2015 09:07:37 +0000 (+0100)
Subject: gitignore: Don't ignore *.rej
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2630
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=7d134b44ac32918744563640cb319f7b3184969d;p=xen.git

gitignore: Don't ignore *.rej

These indicate a patch application went wrong, I want to see them in
"git status". This appears to have been imported from .hgignore where
it has been since 2005.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/.gitignore b/.gitignore
index bccbd12016..dafa3c4051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .hg
 *.orig
-*.rej
 *~
 *.swp
 *.o